Update for rspec3 rails_helpers config, fix shoulda matchers

Dustin Miller 8 years ago
parent
commit
c5766d2086
101 changed files with 125 additions and 123 deletions
  1. 1 1
      app/concerns/sortable_events.rb
  2. 1 1
      spec/concerns/dry_runnable_spec.rb
  3. 1 1
      spec/concerns/form_configurable_spec.rb
  4. 1 1
      spec/concerns/inheritance_tracking_spec.rb
  5. 1 1
      spec/concerns/liquid_droppable_spec.rb
  6. 1 1
      spec/concerns/liquid_interpolatable_spec.rb
  7. 1 1
      spec/concerns/long_runnable_spec.rb
  8. 3 3
      spec/concerns/sortable_events_spec.rb
  9. 1 1
      spec/controllers/agents_controller_spec.rb
  10. 1 1
      spec/controllers/concerns/sortable_table_spec.rb
  11. 1 1
      spec/controllers/events_controller_spec.rb
  12. 1 1
      spec/controllers/jobs_controller_spec.rb
  13. 1 1
      spec/controllers/logs_controller_spec.rb
  14. 1 1
      spec/controllers/omniauth_callbacks_controller_spec.rb
  15. 1 1
      spec/controllers/scenario_imports_controller_spec.rb
  16. 1 1
      spec/controllers/scenarios_controller_spec.rb
  17. 1 1
      spec/controllers/services_controller_spec.rb
  18. 1 1
      spec/controllers/user_credentials_controller_spec.rb
  19. 1 1
      spec/controllers/web_requests_controller_spec.rb
  20. 1 1
      spec/helpers/application_helper_spec.rb
  21. 1 1
      spec/helpers/dot_helper_spec.rb
  22. 1 1
      spec/helpers/jobs_helper_spec.rb
  23. 1 1
      spec/helpers/markdown_helper_spec.rb
  24. 1 1
      spec/helpers/scenario_helper_spec.rb
  25. 1 1
      spec/lib/agent_runner_spec.rb
  26. 1 1
      spec/lib/agents_exporter_spec.rb
  27. 1 1
      spec/lib/delayed_job_worker_spec.rb
  28. 1 1
      spec/lib/huginn_scheduler_spec.rb
  29. 1 1
      spec/lib/liquid_migrator_spec.rb
  30. 3 3
      spec/lib/location_spec.rb
  31. 1 1
      spec/lib/utils_spec.rb
  32. 1 1
      spec/models/agent_log_spec.rb
  33. 3 3
      spec/models/agent_spec.rb
  34. 1 1
      spec/models/agents/adioso_agent_spec.rb
  35. 1 1
      spec/models/agents/basecamp_agent_spec.rb
  36. 1 1
      spec/models/agents/change_detector_agent_spec.rb
  37. 1 1
      spec/models/agents/commander_agent_spec.rb
  38. 1 1
      spec/models/agents/data_output_agent_spec.rb
  39. 1 1
      spec/models/agents/de_duplication_agent_spec.rb
  40. 1 1
      spec/models/agents/delay_agent_spec.rb
  41. 1 1
      spec/models/agents/dropbox_file_url_agent_spec.rb
  42. 1 1
      spec/models/agents/dropbox_watch_agent_spec.rb
  43. 1 1
      spec/models/agents/email_agent_spec.rb
  44. 1 1
      spec/models/agents/email_digest_agent_spec.rb
  45. 1 1
      spec/models/agents/event_formatting_agent_spec.rb
  46. 1 1
      spec/models/agents/evernote_agent_spec.rb
  47. 2 2
      spec/models/agents/ftpsite_agent_spec.rb
  48. 1 1
      spec/models/agents/gap_detector_agent_spec.rb
  49. 1 1
      spec/models/agents/google_calendar_publish_agent_spec.rb
  50. 1 1
      spec/models/agents/growl_agent_spec.rb
  51. 1 1
      spec/models/agents/hipchat_agent_spec.rb
  52. 1 1
      spec/models/agents/human_task_agent_spec.rb
  53. 1 1
      spec/models/agents/imap_folder_agent_spec.rb
  54. 1 1
      spec/models/agents/jabber_agent_spec.rb
  55. 1 1
      spec/models/agents/java_script_agent_spec.rb
  56. 1 1
      spec/models/agents/jira_agent_spec.rb
  57. 1 1
      spec/models/agents/mqtt_agent_spec.rb
  58. 1 1
      spec/models/agents/pdf_agent_spec.rb
  59. 1 1
      spec/models/agents/peak_detector_agent_spec.rb
  60. 1 1
      spec/models/agents/post_agent_spec.rb
  61. 1 1
      spec/models/agents/public_transport_agent_spec.rb
  62. 1 1
      spec/models/agents/pushbullet_agent_spec.rb
  63. 1 1
      spec/models/agents/pushover_agent_spec.rb
  64. 1 1
      spec/models/agents/rss_agent_spec.rb
  65. 1 1
      spec/models/agents/scheduler_agent_spec.rb
  66. 1 1
      spec/models/agents/sentiment_agent_spec.rb
  67. 1 1
      spec/models/agents/shell_command_agent_spec.rb
  68. 1 1
      spec/models/agents/slack_agent_spec.rb
  69. 1 1
      spec/models/agents/stubhub_agent_spec.rb
  70. 1 1
      spec/models/agents/translation_agent_spec.rb
  71. 1 1
      spec/models/agents/trigger_agent_spec.rb
  72. 1 1
      spec/models/agents/tumblr_publish_agent_spec.rb
  73. 1 1
      spec/models/agents/twilio_agent_spec.rb
  74. 1 1
      spec/models/agents/twitter_publish_agent_spec.rb
  75. 1 1
      spec/models/agents/twitter_search_agent_spec.rb
  76. 1 1
      spec/models/agents/twitter_stream_agent_spec.rb
  77. 1 1
      spec/models/agents/twitter_user_agent_spec.rb
  78. 1 1
      spec/models/agents/user_location_agent_spec.rb
  79. 1 1
      spec/models/agents/weather_agent_spec.rb
  80. 1 1
      spec/models/agents/webhook_agent_spec.rb
  81. 1 1
      spec/models/agents/website_agent_spec.rb
  82. 1 1
      spec/models/agents/weibo_publish_agent_spec.rb
  83. 1 1
      spec/models/agents/weibo_user_agent_spec.rb
  84. 1 1
      spec/models/agents/witai_agent_spec.rb
  85. 1 1
      spec/models/agents/wunderlist_agent_spec.rb
  86. 1 1
      spec/models/concerns/oauthable.rb
  87. 1 1
      spec/models/event_spec.rb
  88. 1 1
      spec/models/scenario_import_spec.rb
  89. 1 1
      spec/models/scenario_spec.rb
  90. 1 1
      spec/models/service_spec.rb
  91. 8 8
      spec/models/user_credential_spec.rb
  92. 4 4
      spec/models/users_spec.rb
  93. 1 1
      spec/presenters/form_configurable_agent_presenter_spec.rb
  94. 7 5
      spec/spec_helper.rb
  95. 1 1
      spec/routing/webhooks_controller_spec.rb
  96. 1 1
      spec/support/shared_examples/agent_controller_concern.rb
  97. 1 1
      spec/support/shared_examples/email_concern.rb
  98. 1 1
      spec/support/shared_examples/has_guid.rb
  99. 2 2
      spec/support/shared_examples/liquid_interpolatable.rb
  100. 1 1
      spec/support/shared_examples/web_request_concern.rb
  101. 1 1
      spec/support/shared_examples/working_helpers.rb

+ 1 - 1
app/concerns/sortable_events.rb

@@ -11,7 +11,7 @@ module SortableEvents
11 11
 
12 12
   module ClassMethods
13 13
     def can_order_created_events!
14
-      raise if cannot_create_events?
14
+      raise 'Cannot order events for agent that cannot create events' if cannot_create_events?
15 15
       prepend AutomaticSorter
16 16
     end
17 17
 

+ 1 - 1
spec/concerns/dry_runnable_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe DryRunnable do
4 4
   class Agents::SandboxedAgent < Agent

+ 1 - 1
spec/concerns/form_configurable_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe FormConfigurable do
4 4
   class Agent1

+ 1 - 1
spec/concerns/inheritance_tracking_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'inheritance_tracking'
3 3
 
4 4
 describe InheritanceTracking do

+ 1 - 1
spec/concerns/liquid_droppable_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe LiquidDroppable do
4 4
   before do

+ 1 - 1
spec/concerns/liquid_interpolatable_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'nokogiri'
3 3
 
4 4
 describe LiquidInterpolatable::Filters do

+ 1 - 1
spec/concerns/long_runnable_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe LongRunnable do
4 4
   class LongRunnableAgent < Agent

+ 3 - 3
spec/concerns/sortable_events_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe SortableEvents do
4 4
   let(:agent_class) {
@@ -152,7 +152,7 @@ describe SortableEvents do
152 152
             passive_agent_class.class_eval do
153 153
               can_order_created_events!
154 154
             end
155
-          }.to raise_error
155
+          }.to raise_error('Cannot order events for agent that cannot create events')
156 156
         end
157 157
 
158 158
         it 'should work if called from an Agent that can create events' do
@@ -160,7 +160,7 @@ describe SortableEvents do
160 160
             active_agent_class.class_eval do
161 161
               can_order_created_events!
162 162
             end
163
-          }.not_to raise_error
163
+          }.not_to raise_error()
164 164
         end
165 165
       end
166 166
 

+ 1 - 1
spec/controllers/agents_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe AgentsController do
4 4
   def valid_attributes(options = {})

+ 1 - 1
spec/controllers/concerns/sortable_table_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe SortableTable do
4 4
   class SortableTestController

+ 1 - 1
spec/controllers/events_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe EventsController do
4 4
   before do

+ 1 - 1
spec/controllers/jobs_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe JobsController do
4 4
   describe "GET index" do

+ 1 - 1
spec/controllers/logs_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe LogsController do
4 4
   describe "GET index" do

+ 1 - 1
spec/controllers/omniauth_callbacks_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe OmniauthCallbacksController do
4 4
   before do

+ 1 - 1
spec/controllers/scenario_imports_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe ScenarioImportsController do
4 4
   before do

+ 1 - 1
spec/controllers/scenarios_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe ScenariosController do
4 4
   def valid_attributes(options = {})

+ 1 - 1
spec/controllers/services_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe ServicesController do
4 4
   before do

+ 1 - 1
spec/controllers/user_credentials_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe UserCredentialsController do
4 4
   def valid_attributes(options = {})

+ 1 - 1
spec/controllers/web_requests_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe WebRequestsController do
4 4
   class Agents::WebRequestReceiverAgent < Agent

+ 1 - 1
spec/helpers/application_helper_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe ApplicationHelper do
4 4
   describe '#icon_tag' do

+ 1 - 1
spec/helpers/dot_helper_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe DotHelper do
4 4
   describe "with example Agents" do

+ 1 - 1
spec/helpers/jobs_helper_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe JobsHelper do
4 4
   let(:job) { Delayed::Job.new }

+ 1 - 1
spec/helpers/markdown_helper_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe MarkdownHelper do
4 4
 

+ 1 - 1
spec/helpers/scenario_helper_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe ScenarioHelper do
4 4
   let(:scenario) { users(:bob).scenarios.build(name: 'Scene', tag_fg_color: '#AAAAAA', tag_bg_color: '#000000') }

+ 1 - 1
spec/lib/agent_runner_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe AgentRunner do
4 4
   context "without traps" do

+ 1 - 1
spec/lib/agents_exporter_spec.rb

@@ -1,6 +1,6 @@
1 1
 # encoding: utf-8
2 2
 
3
-require 'spec_helper'
3
+require 'rails_helper'
4 4
 
5 5
 describe AgentsExporter do
6 6
   describe "#as_json" do

+ 1 - 1
spec/lib/delayed_job_worker_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe DelayedJobWorker do
4 4
   before do

+ 1 - 1
spec/lib/huginn_scheduler_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'huginn_scheduler'
3 3
 
4 4
 describe HuginnScheduler do

+ 1 - 1
spec/lib/liquid_migrator_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe LiquidMigrator do
4 4
   describe "converting JSONPath strings" do

+ 3 - 3
spec/lib/location_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Location do
4 4
   let(:location) {
@@ -30,14 +30,14 @@ describe Location do
30 30
     expect(location['lat']).to eq 2.0
31 31
   end
32 32
 
33
-  it "has a convencience accessor for combined latitude and longitude" do
33
+  it "has a convenience accessor for combined latitude and longitude" do
34 34
     expect(location.latlng).to eq "2.0,3.0"
35 35
   end
36 36
 
37 37
   it "does not allow hash-style assignment" do
38 38
     expect {
39 39
       location[:lat] = 2.0
40
-    }.to raise_error
40
+    }.to raise_error(NoMethodError)
41 41
   end
42 42
 
43 43
   it "ignores invalid values" do

+ 1 - 1
spec/lib/utils_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Utils do
4 4
   describe "#unindent" do

+ 1 - 1
spec/models/agent_log_spec.rb

@@ -1,5 +1,5 @@
1 1
 # -*- coding: utf-8 -*-
2
-require 'spec_helper'
2
+require 'rails_helper'
3 3
 
4 4
 describe AgentLog do
5 5
   describe "validations" do

+ 3 - 3
spec/models/agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agent do
4 4
   it_behaves_like WorkingHelpers
@@ -223,7 +223,7 @@ describe Agent do
223 223
         mock(Agent).find(@checker.id) { @checker }
224 224
         expect {
225 225
           Agents::SomethingSource.async_check(@checker.id)
226
-        }.to raise_error
226
+        }.to raise_error(RuntimeError)
227 227
         log = @checker.logs.first
228 228
         expect(log.message).to match(/Exception/)
229 229
         expect(log.level).to eq(4)
@@ -263,7 +263,7 @@ describe Agent do
263 263
         Agent.async_check(agents(:bob_weather_agent).id)
264 264
         expect {
265 265
           Agent.async_receive(agents(:bob_rain_notifier_agent).id, [agents(:bob_weather_agent).events.last.id])
266
-        }.to raise_error
266
+        }.to raise_error(RuntimeError)
267 267
         log = agents(:bob_rain_notifier_agent).logs.first
268 268
         expect(log.message).to match(/Exception/)
269 269
         expect(log.level).to eq(4)

+ 1 - 1
spec/models/agents/adioso_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::AdiosoAgent do
4 4
 	before do

+ 1 - 1
spec/models/agents/basecamp_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'models/concerns/oauthable'
3 3
 
4 4
 describe Agents::BasecampAgent do

+ 1 - 1
spec/models/agents/change_detector_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::ChangeDetectorAgent do
4 4
   def create_event(output=nil)

+ 1 - 1
spec/models/agents/commander_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::CommanderAgent do
4 4
   let(:valid_params) {

+ 1 - 1
spec/models/agents/data_output_agent_spec.rb

@@ -1,6 +1,6 @@
1 1
 # encoding: utf-8
2 2
 
3
-require 'spec_helper'
3
+require 'rails_helper'
4 4
 
5 5
 describe Agents::DataOutputAgent do
6 6
   let(:agent) do

+ 1 - 1
spec/models/agents/de_duplication_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::DeDuplicationAgent do
4 4
   def create_event(output=nil)

+ 1 - 1
spec/models/agents/delay_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::DelayAgent do
4 4
   let(:agent) do

+ 1 - 1
spec/models/agents/dropbox_file_url_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::DropboxFileUrlAgent do
4 4
   before(:each) do

+ 1 - 1
spec/models/agents/dropbox_watch_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::DropboxWatchAgent do
4 4
   before(:each) do

+ 1 - 1
spec/models/agents/email_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::EmailAgent do
4 4
   it_behaves_like EmailConcern

+ 1 - 1
spec/models/agents/email_digest_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::EmailDigestAgent do
4 4
   it_behaves_like EmailConcern

+ 1 - 1
spec/models/agents/event_formatting_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::EventFormattingAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/evernote_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::EvernoteAgent do
4 4
   class FakeEvernoteNoteStore

+ 2 - 2
spec/models/agents/ftpsite_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'time'
3 3
 
4 4
 describe Agents::FtpsiteAgent do
@@ -26,7 +26,7 @@ describe Agents::FtpsiteAgent do
26 26
 
27 27
       it "should validate the integer fields" do
28 28
         @checker.options['expected_update_period_in_days'] = "nonsense"
29
-        expect { @checker.save! }.to raise_error;
29
+        expect { @checker.save! }.to raise_error(/Invalid expected_update_period_in_days format/);
30 30
         @checker.options = @site
31 31
       end
32 32
 

+ 1 - 1
spec/models/agents/gap_detector_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::GapDetectorAgent do
4 4
   let(:valid_params) {

+ 1 - 1
spec/models/agents/google_calendar_publish_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::GoogleCalendarPublishAgent, :vcr do
4 4
   before do

+ 1 - 1
spec/models/agents/growl_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::GrowlAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/hipchat_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::HipchatAgent do
4 4
   before(:each) do

+ 1 - 1
spec/models/agents/human_task_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::HumanTaskAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/imap_folder_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'time'
3 3
 
4 4
 describe Agents::ImapFolderAgent do

+ 1 - 1
spec/models/agents/jabber_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::JabberAgent do
4 4
   let(:sent) { [] }

+ 1 - 1
spec/models/agents/java_script_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::JavaScriptAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/jira_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::JiraAgent do
4 4
   before(:each) do

+ 1 - 1
spec/models/agents/mqtt_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'mqtt'
3 3
 require './spec/support/fake_mqtt_server'
4 4
 

+ 1 - 1
spec/models/agents/pdf_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::PdfInfoAgent do
4 4
   let(:agent) do

+ 1 - 1
spec/models/agents/peak_detector_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::PeakDetectorAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/post_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'ostruct'
3 3
 
4 4
 describe Agents::PostAgent do

+ 1 - 1
spec/models/agents/public_transport_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 describe Agents::PublicTransportAgent do
3 3
   before do
4 4
     valid_params = {

+ 1 - 1
spec/models/agents/pushbullet_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::PushbulletAgent do
4 4
   before(:each) do

+ 1 - 1
spec/models/agents/pushover_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::PushoverAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/rss_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::RssAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/scheduler_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::SchedulerAgent do
4 4
   let(:valid_params) {

+ 1 - 1
spec/models/agents/sentiment_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::SentimentAgent do
4 4
     before do

+ 1 - 1
spec/models/agents/shell_command_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::ShellCommandAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/slack_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::SlackAgent do
4 4
   before(:each) do

+ 1 - 1
spec/models/agents/stubhub_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::StubhubAgent do
4 4
 

+ 1 - 1
spec/models/agents/translation_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::TranslationAgent do
4 4
     before do

+ 1 - 1
spec/models/agents/trigger_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::TriggerAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/tumblr_publish_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::TumblrPublishAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/twilio_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::TwilioAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/twitter_publish_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::TwitterPublishAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/twitter_search_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::TwitterSearchAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/twitter_stream_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::TwitterStreamAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/twitter_user_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::TwitterUserAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/user_location_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::UserLocationAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/weather_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::WeatherAgent do
4 4
   let(:agent) do

+ 1 - 1
spec/models/agents/webhook_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::WebhookAgent do
4 4
   let(:agent) do

+ 1 - 1
spec/models/agents/website_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::WebsiteAgent do
4 4
   describe "checking without basic auth" do

+ 1 - 1
spec/models/agents/weibo_publish_agent_spec.rb

@@ -1,5 +1,5 @@
1 1
 # encoding: utf-8 
2
-require 'spec_helper'
2
+require 'rails_helper'
3 3
 
4 4
 describe Agents::WeiboPublishAgent do
5 5
   before do

+ 1 - 1
spec/models/agents/weibo_user_agent_spec.rb

@@ -1,5 +1,5 @@
1 1
 # encoding: utf-8 
2
-require 'spec_helper'
2
+require 'rails_helper'
3 3
 
4 4
 describe Agents::WeiboUserAgent do
5 5
   before do

+ 1 - 1
spec/models/agents/witai_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Agents::WitaiAgent do
4 4
   before do

+ 1 - 1
spec/models/agents/wunderlist_agent_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 require 'models/concerns/oauthable'
3 3
 
4 4
 describe Agents::WunderlistAgent do

+ 1 - 1
spec/models/concerns/oauthable.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 module Agents
4 4
   class OauthableTestAgent < Agent

+ 1 - 1
spec/models/event_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Event do
4 4
   describe ".with_location" do

+ 1 - 1
spec/models/scenario_import_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe ScenarioImport do
4 4
   let(:user) { users(:bob) }

+ 1 - 1
spec/models/scenario_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Scenario do
4 4
   let(:new_instance) { users(:bob).scenarios.build(:name => "some scenario") }

+ 1 - 1
spec/models/service_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe Service do
4 4
   before(:each) do

+ 8 - 8
spec/models/user_credential_spec.rb

@@ -1,19 +1,19 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe UserCredential do
4 4
   describe "validation" do
5
-    it { is_expected.to validate_uniqueness_of(:credential_name).scoped_to(:user_id) }
6
-    it { is_expected.to validate_presence_of(:credential_name) }
7
-    it { is_expected.to validate_presence_of(:credential_value) }
8
-    it { is_expected.to validate_presence_of(:user_id) }
5
+    it { should validate_uniqueness_of(:credential_name).scoped_to(:user_id) }
6
+    it { should validate_presence_of(:credential_name) }
7
+    it { should validate_presence_of(:credential_value) }
8
+    it { should validate_presence_of(:user_id) }
9 9
   end
10 10
 
11 11
   describe "mass assignment" do
12
-    it { is_expected.to allow_mass_assignment_of :credential_name }
12
+    it { should allow_mass_assignment_of :credential_name }
13 13
 
14
-    it { is_expected.to allow_mass_assignment_of :credential_value }
14
+    it { should allow_mass_assignment_of :credential_value }
15 15
 
16
-    it { is_expected.not_to allow_mass_assignment_of :user_id }
16
+    it { should_not allow_mass_assignment_of :user_id }
17 17
   end
18 18
 
19 19
   describe "cleaning fields" do

+ 4 - 4
spec/models/users_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe User do
4 4
   describe "validations" do
@@ -10,13 +10,13 @@ describe User do
10 10
         
11 11
         it "only accepts valid invitation codes" do
12 12
           User::INVITATION_CODES.each do |v|
13
-            is_expected.to allow_value(v).for(:invitation_code)
13
+            should allow_value(v).for(:invitation_code)
14 14
           end
15 15
         end
16 16
   
17 17
         it "can reject invalid invitation codes" do
18 18
           %w['foo', 'bar'].each do |v|
19
-            is_expected.not_to allow_value(v).for(:invitation_code)
19
+            should_not allow_value(v).for(:invitation_code)
20 20
           end
21 21
         end
22 22
       end
@@ -28,7 +28,7 @@ describe User do
28 28
         
29 29
         it "skips this validation" do
30 30
           %w['foo', 'bar', nil, ''].each do |v|
31
-            is_expected.to allow_value(v).for(:invitation_code)
31
+            should allow_value(v).for(:invitation_code)
32 32
           end
33 33
         end
34 34
       end

+ 1 - 1
spec/presenters/form_configurable_agent_presenter_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe FormConfigurableAgentPresenter do
4 4
   include RSpecHtmlMatchers

+ 7 - 5
spec/spec_helper.rb

@@ -21,11 +21,13 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
21 21
 
22 22
 ActiveRecord::Migration.maintain_test_schema!
23 23
 
24
-# TODO: This will silence warnings when the raise_error matcher
25
-# is used without providing a specific error or error message.
26
-# Specs SHOULD pass the type of error that you're expecting to be
27
-# raised when using the raise_error matcher.
28
-RSpec::Expectations.configuration.warn_about_potential_false_positives = false
24
+# Mix in shoulda matchers
25
+Shoulda::Matchers.configure do |config|
26
+  config.integrate do |with|
27
+    with.test_framework :rspec
28
+    with.library :rails
29
+  end
30
+end
29 31
 
30 32
 RSpec.configure do |config|
31 33
   config.mock_with :rr

+ 1 - 1
spec/routing/webhooks_controller_spec.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 describe "routing for web requests", :type => :routing do
4 4
   it "routes to handle_request" do

+ 1 - 1
spec/support/shared_examples/agent_controller_concern.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 shared_examples_for AgentControllerConcern do
4 4
   describe "preconditions" do

+ 1 - 1
spec/support/shared_examples/email_concern.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 shared_examples_for EmailConcern do
4 4
   let(:valid_options) {

+ 1 - 1
spec/support/shared_examples/has_guid.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 shared_examples_for HasGuid do
4 4
   it "gets created before_save, but only if it's not present" do

+ 2 - 2
spec/support/shared_examples/liquid_interpolatable.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 shared_examples_for LiquidInterpolatable do
4 4
   before(:each) do
@@ -94,7 +94,7 @@ shared_examples_for LiquidInterpolatable do
94 94
       it "should raise an exception for undefined credentials" do
95 95
         expect {
96 96
           @checker.interpolate_string("{% credential unknown %}", {})
97
-        }.to raise_error
97
+        }.to raise_error(/No user credential named/)
98 98
       end
99 99
     end
100 100
 

+ 1 - 1
spec/support/shared_examples/web_request_concern.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 shared_examples_for WebRequestConcern do
4 4
   let(:agent) do

+ 1 - 1
spec/support/shared_examples/working_helpers.rb

@@ -1,4 +1,4 @@
1
-require 'spec_helper'
1
+require 'rails_helper'
2 2
 
3 3
 shared_examples_for WorkingHelpers do
4 4
   describe "recent_error_logs?" do